From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 1 Jul 2020 15:18:16 +0000 (+0200)
Subject: status/system: Swap power- and user-related items in session menu
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~684^2^2~50
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=e6153bb578187e92b1ef221bcc172e2816c382b6;p=gnome-shell.git

status/system: Swap power- and user-related items in session menu

Quoting Allan:
"It's been niggling me that log out is closest to hand,
as opposed to suspend"

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2202
---

diff --git a/js/ui/status/system.js b/js/ui/status/system.js
index 3feb9ac85..c5673913e 100644
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -113,50 +113,50 @@ class Indicator extends PanelMenu.SystemIndicator {
             _('Power Off / Log Out'), true);
         this._sessionSubMenu.icon.icon_name = 'system-shutdown-symbolic';
 
-        item = new PopupMenu.PopupMenuItem(_("Log Out"));
+        item = new PopupMenu.PopupMenuItem(_('Suspend'));
         item.connect('activate', () => {
             this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
-            this._systemActions.activateLogout();
+            this._systemActions.activateSuspend();
         });
         this._sessionSubMenu.menu.addMenuItem(item);
-        this._logoutItem = item;
-        this._systemActions.bind_property('can-logout',
-            this._logoutItem, 'visible',
+        this._suspendItem = item;
+        this._systemActions.bind_property('can-suspend',
+            this._suspendItem, 'visible',
             bindFlags);
 
-        item = new PopupMenu.PopupMenuItem(_("Switch User…"));
+        item = new PopupMenu.PopupMenuItem(_('Power Off…'));
         item.connect('activate', () => {
             this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
-            this._systemActions.activateSwitchUser();
+            this._systemActions.activatePowerOff();
         });
         this._sessionSubMenu.menu.addMenuItem(item);
-        this._loginScreenItem = item;
-        this._systemActions.bind_property('can-switch-user',
-            this._loginScreenItem, 'visible',
+        this._powerOffItem = item;
+        this._systemActions.bind_property('can-power-off',
+            this._powerOffItem, 'visible',
             bindFlags);
 
         this._sessionSubMenu.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
 
-        item = new PopupMenu.PopupMenuItem(_("Suspend"));
+        item = new PopupMenu.PopupMenuItem(_('Log Out'));
         item.connect('activate', () => {
             this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
-            this._systemActions.activateSuspend();
+            this._systemActions.activateLogout();
         });
         this._sessionSubMenu.menu.addMenuItem(item);
-        this._suspendItem = item;
-        this._systemActions.bind_property('can-suspend',
-            this._suspendItem, 'visible',
+        this._logoutItem = item;
+        this._systemActions.bind_property('can-logout',
+            this._logoutItem, 'visible',
             bindFlags);
 
-        item = new PopupMenu.PopupMenuItem(_("Power Off…"));
+        item = new PopupMenu.PopupMenuItem(_('Switch User…'));
         item.connect('activate', () => {
             this.menu.itemActivated(BoxPointer.PopupAnimation.NONE);
-            this._systemActions.activatePowerOff();
+            this._systemActions.activateSwitchUser();
         });
         this._sessionSubMenu.menu.addMenuItem(item);
-        this._powerOffItem = item;
-        this._systemActions.bind_property('can-power-off',
-            this._powerOffItem, 'visible',
+        this._loginScreenItem = item;
+        this._systemActions.bind_property('can-switch-user',
+            this._loginScreenItem, 'visible',
             bindFlags);
 
         this.menu.addMenuItem(this._sessionSubMenu);